From 5d50d3d16f22eaf8959e966e0c3934b8aef18924 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 5 Mar 2004 08:37:11 +0000 Subject: [PATCH] chain to the extra_widget. Fri Mar 5 03:37:14 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): chain to the extra_widget. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 7 ++++++- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9776afbe68..87a59b9711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 5 03:37:14 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): + chain to the extra_widget. + Fri Mar 5 02:53:41 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9776afbe68..87a59b9711 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Mar 5 03:37:14 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): + chain to the extra_widget. + Fri Mar 5 02:53:41 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9776afbe68..87a59b9711 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Mar 5 03:37:14 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): + chain to the extra_widget. + Fri Mar 5 02:53:41 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9776afbe68..87a59b9711 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Mar 5 03:37:14 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): + chain to the extra_widget. + Fri Mar 5 02:53:41 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9776afbe68..87a59b9711 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Mar 5 03:37:14 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_show_all): + chain to the extra_widget. + Fri Mar 5 02:53:41 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index bbb3a36a60..801a2ec113 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -707,7 +707,7 @@ set_preview_widget (GtkFileChooserDefault *impl, impl->preview_widget = preview_widget; if (impl->preview_widget) { - gtk_widget_show_all (impl->preview_widget); + gtk_widget_show (impl->preview_widget); gtk_box_pack_start (GTK_BOX (impl->preview_box), impl->preview_widget, TRUE, TRUE, 0); gtk_box_reorder_child (GTK_BOX (impl->preview_box), impl->preview_widget, @@ -2615,7 +2615,12 @@ gtk_file_chooser_default_dispose (GObject *object) static void gtk_file_chooser_default_show_all (GtkWidget *widget) { + GtkFileChooserDefault *impl = (GtkFileChooserDefault *) object; + gtk_widget_show (widget); + + if (impl->extra_widget) + gtk_widget_show_all (impl->extra_widget); } static void -- 2.30.2